Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <[email protected]>
Wed, 18 Dec 2013 23:45:39 +0000 (18:45 -0500)
committerTom Rini <[email protected]>
Wed, 18 Dec 2013 23:45:39 +0000 (18:45 -0500)

Trivial merge